From: Roger Pau Monne Date: Tue, 26 Apr 2016 10:07:49 +0000 (+0200) Subject: tools/headers: prevent adding two __align8__ to uint64_t in ARM headers X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1238 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=e69f9a4196ae8e297d6216491a5b9f1fa1a719f8;p=xen.git tools/headers: prevent adding two __align8__ to uint64_t in ARM headers Due to the fact that on ARM headers types are substituted to uint64_t and then uint64_t is also substituted to contain the aligment, this would lead to some types containing two __align8__ directives. Fix this by first expanding Xen specific types to uint64_t only, and then replacing all the uint64_t types to __align8__ uint64_t. This relies on the fact that all Xen-specific types will have longer names, so they will always be replaced first. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper Acked-by: Wei Liu Reviewed-by: Doug Goldstein Release-acked-by: Wei Liu --- diff --git a/tools/include/xen-foreign/mkheader.py b/tools/include/xen-foreign/mkheader.py index 0504cb8d5b..0e42e14f8e 100644 --- a/tools/include/xen-foreign/mkheader.py +++ b/tools/include/xen-foreign/mkheader.py @@ -20,8 +20,8 @@ footer = {}; inttypes["arm32"] = { "unsigned long" : "__danger_unsigned_long_on_arm32", "long" : "__danger_long_on_arm32", - "xen_pfn_t" : "__align8__ uint64_t", - "xen_ulong_t" : "__align8__ uint64_t", + "xen_pfn_t" : "uint64_t", + "xen_ulong_t" : "uint64_t", "uint64_t" : "__align8__ uint64_t", }; header["arm32"] = """ @@ -41,8 +41,8 @@ footer["arm32"] = """ inttypes["arm64"] = { "unsigned long" : "__danger_unsigned_long_on_arm64", "long" : "__danger_long_on_arm64", - "xen_pfn_t" : "__align8__ uint64_t", - "xen_ulong_t" : "__align8__ uint64_t", + "xen_pfn_t" : "uint64_t", + "xen_ulong_t" : "uint64_t", "uint64_t" : "__align8__ uint64_t", }; header["arm64"] = """